Fix problem where retrieved atoms weren't properly returned.

Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
	problem where retrieved atoms weren't properly returned.

diff --git a/ChangeLog b/ChangeLog
index b5fdd0428083ecdb2a85d3172321708c752243b9..cc1d66132811023680eedb0a5600b0667bd32dff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
+       problem where retrieved atoms weren't properly returned.
+
 2002-01-03  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): When
@@ -37,7 +42,6 @@ Wed Jan  2 23:09:06 2002  Tim Janik  <timj@gtk.org>
        * gtk/Makefile.am (LDFLAGS): automake still doesn't support
        libsomething_la_LDFLAGS, so fix the build again
 
-
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b5fdd0428083ecdb2a85d3172321708c752243b9..cc1d66132811023680eedb0a5600b0667bd32dff 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
+       problem where retrieved atoms weren't properly returned.
+
 2002-01-03  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): When
@@ -37,7 +42,6 @@ Wed Jan  2 23:09:06 2002  Tim Janik  <timj@gtk.org>
        * gtk/Makefile.am (LDFLAGS): automake still doesn't support
        libsomething_la_LDFLAGS, so fix the build again
 
-
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b5fdd0428083ecdb2a85d3172321708c752243b9..cc1d66132811023680eedb0a5600b0667bd32dff 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
+       problem where retrieved atoms weren't properly returned.
+
 2002-01-03  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): When
@@ -37,7 +42,6 @@ Wed Jan  2 23:09:06 2002  Tim Janik  <timj@gtk.org>
        * gtk/Makefile.am (LDFLAGS): automake still doesn't support
        libsomething_la_LDFLAGS, so fix the build again
 
-
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b5fdd0428083ecdb2a85d3172321708c752243b9..cc1d66132811023680eedb0a5600b0667bd32dff 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
+       problem where retrieved atoms weren't properly returned.
+
 2002-01-03  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): When
@@ -37,7 +42,6 @@ Wed Jan  2 23:09:06 2002  Tim Janik  <timj@gtk.org>
        * gtk/Makefile.am (LDFLAGS): automake still doesn't support
        libsomething_la_LDFLAGS, so fix the build again
 
-
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b5fdd0428083ecdb2a85d3172321708c752243b9..cc1d66132811023680eedb0a5600b0667bd32dff 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
+       problem where retrieved atoms weren't properly returned.
+
 2002-01-03  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): When
@@ -37,7 +42,6 @@ Wed Jan  2 23:09:06 2002  Tim Janik  <timj@gtk.org>
        * gtk/Makefile.am (LDFLAGS): automake still doesn't support
        libsomething_la_LDFLAGS, so fix the build again
 
-
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b5fdd0428083ecdb2a85d3172321708c752243b9..cc1d66132811023680eedb0a5600b0667bd32dff 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
+       problem where retrieved atoms weren't properly returned.
+
 2002-01-03  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): When
@@ -37,7 +42,6 @@ Wed Jan  2 23:09:06 2002  Tim Janik  <timj@gtk.org>
        * gtk/Makefile.am (LDFLAGS): automake still doesn't support
        libsomething_la_LDFLAGS, so fix the build again
 
-
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b5fdd0428083ecdb2a85d3172321708c752243b9..cc1d66132811023680eedb0a5600b0667bd32dff 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Dec 27 18:12:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Fix
+       problem where retrieved atoms weren't properly returned.
+
 2002-01-03  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktextview.c (gtk_text_view_key_press_event): When
@@ -37,7 +42,6 @@ Wed Jan  2 23:09:06 2002  Tim Janik  <timj@gtk.org>
        * gtk/Makefile.am (LDFLAGS): automake still doesn't support
        libsomething_la_LDFLAGS, so fix the build again
 
-
 2002-01-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index f7e315b707859face3e1fe9e065e7661573a0b17..320f9faf8de46abcf8bc0b294987f2e6a72cd011 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -392,7 +392,7 @@ gdk_property_get (GdkWindow   *window,
          GdkAtom *ret_atoms = g_new (GdkAtom, ret_nitems);
          Atom *xatoms = (Atom *)ret_data;
 
-         data = (guchar *)ret_atoms;
+         *data = (guchar *)ret_atoms;
 
          for (i = 0; i < ret_nitems; i++)
            ret_atoms[i] = gdk_x11_xatom_to_atom (xatoms[i]);